Bug fixes & PHP 5.4 compatibility