Added various scrutinizer checks