Some psr2 issues fixed