Fixed issues with saving/resuming options.