Fix some scrutinizer-ci reported issues