Minor fixes and psr-4