WIP: more fixes