Bugfixes for broken Sqlite3 builds in some places.