Minor fixes highlighted by scrutinizer-ci