Misc. changes to SL5.7 32-bit templates