cake2.x fixes