Setting Fixes