Trying further fixes