Fixes for settings and confi