Fixup some build errors on linux