Fix up issues left over from boilerplate update