re #91: PHP 5.2 fixes
re #91: Fix locators