Small Fixes and clean-up