wip: hotfixes