Fix problems caused by the last rebase.