Fix some stuff that went wrong in the last merge.