Minor fixes to comply with PSR2