Scrutinizer Fixes