Start fixing things after the last merge.