Fixes/Adjustments