Dev scrutinizer fixes