Settings Fixes