fixing some scrutinizer issues