* PHP 5.3 compatibility fixes, other small fixes [ci skip]