Fix up last merge