WIP: minor fixes