Fix file saving/loading