More fixes and added two missing fields