fix more psr2 stuff