Some minor 3.1 template fixes.