Various clean-ups.