Firebird fixes...