fixed some scrutinizer issues