fixed some scrutinizer bugs