Fixed minor scrutinizer complaints