More firebird coverage