Minor template fixes
remove advanced debug