For upstream/further fixes