UPDATE: Scrutinizer fixes