Additional bugs fixed relating to settings storage.