Fixed scrutinizer bugs