Fix cascade save/delete