Some PSR1 bugfixes