Settings bug fixes

Settings bug fixes