Fixing up settings