Misc. changes to SL4.7 32-bit templates