Fixes and Adjustments