Fixes to settings

Reuses: ec8e081ee154d107099567a32bcb0573a882f5aa