Minor fixes, clean-ups.