Fix scrutinizer issues. refs #100