A couple of further fixes