Fix issues with Ender and Bake