[0.9.4-dev] scrutinizer fixes