Fixes for a few scrutinizer isses