fixes for php 5.2 and phpunit 3.6