Some fixes to current template