Misc. changes to SL5.6 templates