Template not found corrections