Fix some small failures in the template