Fix a few errors
Merge pull request #22 from cakephp/master-fixes

Fix a few errors