Fix base template leftovers