Fix some issues in the eval