fix scrutinizer issues (all solvable ;)