Cake - fixes