#12 : Scrutinizer Fixes