WIP: fixes to run on Ubuntu