Fix load and save problems