clean up warnings in default templates