WIP: fixups