Fix bugs with fields and change finding