Make some improvements as suggested by Scrutinizer CI