[WIP] Scrutinizer fixes