Various fixes for Cake2.4+ & extended functionality

Various fixes for Cake2.4+ & extended functionality