More small fixes for the evalution