Fixed save/load of settings