Fix some stuff from the last merge.