Fixups on linux