Fixed some scrutinizer warnings