More corrections to the enrollment declaration templates.