Try to fix some issues found by Scrutinizer-CI