Bugfixes in evaluation