F56 wip, other small fixes