Fixing save and unpause issues