Fixed Saving bugs