Remove warnings in templates