Fixed loading and saving of buff fields