[Cakes] Small optimizations