Fixing Some Waiver Attributes and PDF generation.