Minor fixes and clean-up
Minor fixes and clean-up