Fix scrutinizer issues
Fix dependencies