Further fixes due to validation changes.