Fixing some scrutinizer notices.