Fill in missing fields