Minor Fixes and Adjustments