[scrutinizer] Ramdom fixes