fixes for scrutinizer-ci initial run