fixes from scrutinizer-ci