Fixing up unnoticed problems from merge.