Minor Fixes to Settings API