Fix some fields