bake template fixes