Small changes to base template