Fixed some goofiness from merge.