Fixing discharge missing fields/not saving