Finally make build fairly sane on Linux