Minor fixes, clean-up