Minor clean-ups.