Fixed some psr-2 compatibility issues