Fixed some problems with the PSR2 automated conversion