Fixed some differences from our master which appeared to be caused by
merging issues previously.