Fixes to comply with PSR2