Fix some of the issues found by Scrutinizer CI