fixes for psr-0