Small Settings Bug Fixes