small scrutnizer fixes