Brought in line with some recent starter template changes