Fixed more back end bugs with saving