Fixing surgery issues with saving & validation