Fixed some issues with saving snapshots