More fixes for CakePhp2 upgrade