Misc. changes to SL5.5 templates