Changes to support Firebird 1.5