Fixed file save/load methods