Fix m32 builds

There were several bugs fixed around selecting m32 builds.