Minor Fixes and clean up