Fixed settings issues