Fixed a few fields