Fixes for errors that appeared when using Cake 2.3.0