Fixed some bugs with fields not being disabled when they should be