Adjustments to the form PDF generator