some scrutinizer fixes