Bug fixes and tweaks for evaluation