Some build fixes..32-bit release works