Slight fixes to the template