Trying to fix up Mark's merge errors