Missing fields fix and clean.
Missing fields fix and clean.