Fixed errors due to added fields