Updates to improve scrutinizer results