Various small fixes from scrutinizer-ci.