Fix member and templates