Bug and field fixes