fix more template vars