Fixed some more Firebird incompatibilities