diff --git a/config.cc b/config.cc
index 2df1b6b1..275143c8 100644
--- a/config.cc
+++ b/config.cc
@@ -176,7 +176,7 @@ OPT_BEGIN(end_date, "e:") {
 OPT_BEGIN(current, "c") {
   if (! config->predicate.empty())
     config->predicate += "&";
-  config->predicate += "(d<t)";
+  config->predicate += "(d<N)";
 } OPT_END(current);
 
 OPT_BEGIN(cleared, "C") {
diff --git a/valexpr.cc b/valexpr.cc
index 6801cf7e..9971bae7 100644
--- a/valexpr.cc
+++ b/valexpr.cc
@@ -407,8 +407,8 @@ value_expr_t * parse_value_term(std::istream& in)
   case 'T': node = new value_expr_t(value_expr_t::TOTAL_EXPR); break;
 
   // Compound terms
-  case 'v': node = parse_value_expr("P(t,d)"); break;
-  case 'V': node = parse_value_term("P(T,d)"); break;
+  case 'v': node = parse_value_expr("P(a,d)"); break;
+  case 'V': node = parse_value_term("P(O,d)"); break;
   case 'g': node = parse_value_expr("v-c"); break;
   case 'G': node = parse_value_expr("V-C"); break;
   case 'o': node = parse_value_expr("d-b"); break;