Minor eval dependencies fixes