Fixing settings etc