New Settings Fixes (Dev)