Tweaks to Fields class