wip/firebird/patches
