load / save fixes