More Scrutinizer Fixes