Normalize fields