WIP more fixes