fix scrutinizer issues (all solvable ;)

Can you link to the actual inspection results? These look like scrutinizer-ci failures :-\