More firebird fixes