Fix Scurtinizer issues