Fixes to ODBC checking