Fixes to App Settings