More improvements for PHP