Fixes to setup and settings update.