Fixes for PHP < 5.4. Fixes #153.