Fix some ordering issues, and switch to 32 bit box to model deployment environment