fix various psr2 things