Minor Fixes/Improvements