WIP: more small fixes