Some more conversion work within index/templates