diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index fb3837303367..de0d7b7a28ec 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4348,10 +4348,6 @@ IMPLEMENT_CONSTASCII_STRING(KEY_STR_COLLECT, "COLLECT");
 IMPLEMENT_CONSTASCII_STRING(KEY_STR_FUSION, "FUSION");
 IMPLEMENT_CONSTASCII_STRING(KEY_STR_INTERSECTION, "INTERSECTION");
 
-IMPLEMENT_CONSTASCII_STRING(FIELD_STR_NULLDATE, "NullDate");
-
-IMPLEMENT_CONSTASCII_STRING(STR_SQL_TOKEN, "SQL_TOKEN_");
-
 //==========================================================================
 //= OParseContext
 //==========================================================================
@@ -4675,7 +4671,7 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage,
         // to work around a bug in MKS YACC return the member m_pParseTree
         // instead of Sdbyyval.pParseNode
 
-        SAL_WARN_IF(!m_pParseTree, "connectivity",
+        SAL_WARN_IF(!m_pParseTree, "connectivity.parse",
             "OSQLParser: Parser did not create ParseTree");
 		return m_pParseTree;
 	}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 0aad9d2cf54e..d8e659c382f7 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -708,7 +708,7 @@ OSQLScanner::~OSQLScanner()
 {
 }
 //------------------------------------------------------------------------------
-void OSQLScanner::SQLyyerror(sal_Char *fmt)
+void OSQLScanner::SQLyyerror(char const *fmt)
 {
 
     if(IN_SQLyyerror)
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index dd0aa463fb3b..cf881c561630 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -54,7 +54,7 @@ namespace connectivity
             {  }
 
         virtual sal_Int32 SQLyygetc(void);
-        virtual void SQLyyerror(char *fmt);
+        virtual void SQLyyerror(char const *fmt);
         virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
         virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
         virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;