VP-91 Form class fixes