Misc. changes to SL4.7 64-bit templates