Fix user template deprecation warnings.