Fix some small issues
Merge pull request #267 from phpbrew/fix-issues

Fix some small issues