some save / load fixes