form xml fixes