A lot of scrutinizer fixes