Fix saving of waivers

Waivers can now be saved properly once again.