WIP: fixes