Fixed some scrutinizer issues