Minor bug fixes
Now Requires PHP 5.3