Unspecified templates fixed