[BUGFIX] Fix some small issuses of the evalfield patch