Some final fixes from the merge mess.