Fix ups to evaluation section