appliyed Scrutinizer fixes