further fixes from ARC