Fixes & Adjustments