small fixes for evaluation