More deprecation warnings in templates fix