More fixes to slim templates