A few fixes to things that didn't make sense.