fields - Minor adjustments