[228afc70c5fa] template fixes