Fields minor changes