More small field type changes