Fixed x86 builds and cleaned up build types etc.