FIX: Smaller changes in the Assure-Form.