fix notices and PHP 5.4 warnings