Linux build: Tiny fixes
Linux build: As usual, Ubuntu wants its own quirks