WIP small fixes