Linux fixes for x86 builds.