fix issues with expected fields.