Template review fixes