More app template fixes.