Fix a few scrutinizer issues