Fixing a few fields here.