WIP minor fixes