diff --git a/local/lib/org-x/org-x-dag.el b/local/lib/org-x/org-x-dag.el
index a733d3f..ff6da52 100644
--- a/local/lib/org-x/org-x-dag.el
+++ b/local/lib/org-x/org-x-dag.el
@@ -881,15 +881,19 @@ deadline (eg via epoch time) or if it has a repeater."
 
       (-let* (((sched dead) (-some->> it-planning
                               (org-ml-get-properties '(:scheduled :deadline))))
-              (task-default (->> (list :todo it-todo
-                                       :sched sched
-                                       :dead dead)
+              (sp (-some-> sched (org-x-dag-partition-timestamp)))
+              (dp (-some-> dead (org-x-dag-partition-timestamp)))
+              (task-default (->> (list :todo it-todo :sched sp :dead dp)
                                  (list :sp-task :task-active))))
         (cond
          ((and child-bss (equal it-todo org-x-kw-hold))
           (new-proj :proj-held))
-         ((and child-bss sched)
+         ((and child-bss sp)
           (either :left "Projects cannot be scheduled"))
+         ((and sp (< 0 (plist-get sp :length)))
+          (either :left "Projects cannot have ranged scheduled timestamps"))
+         ((and dp (< 0 (plist-get dp :length)))
+          (either :left "Projects cannot have ranged deadline timestamps"))
          ((and child-bss (plist-get node-data :effort))
           (either :left "Projects cannot have effort"))
          ((org-x-dag-action-dead-after-parent-p ancestry dead)
@@ -1026,7 +1030,7 @@ deadline (eg via epoch time) or if it has a repeater."
           (org-x-dag-with-datetimes
            a b
            (lambda (a b)
-             (either :right (org-x-dag-datetime-compare a b)))
+             (either :right (org-x-dag-pts-compare a b)))
            (-const (either :left 'length))))))
        (comp2right
         (sched? comp)
@@ -1047,8 +1051,9 @@ deadline (eg via epoch time) or if it has a repeater."
        (new-active
         (ts-data child-scheds)
         (->> (list :dead (plist-get ts-data :dead)
-                   :child-sched-dts child-scheds
-                   :leading-sched-dt (org-x-dag-datetime-max child-scheds))
+                   :child-scheds child-scheds
+                   :leading-sched-dt (-> (org-x-dag-pts-max child-scheds)
+                                         (plist-get :datetime)))
              (funcall new-active-fun))))
     (org-x-dag-bs-action-rankfold-children child-bss default
       (lambda (acc next)
@@ -1087,7 +1092,7 @@ deadline (eg via epoch time) or if it has a repeater."
           (_ nil)))
       (lambda (next)
         (pcase next
-          (`(:si-proj :proj-active ,d) (plist-get d :child-scheds))
+          (`(:si-proj :proj-active ,d) (plist-get d :child-sched-dts))
           (`(:si-task :task-active ,d) (-some-> (plist-get d :sched) (list)))
           (_ nil)))
       (lambda (acc cs)
@@ -1137,8 +1142,7 @@ deadline (eg via epoch time) or if it has a repeater."
         (either :left "Deadlined sub-iterators cannot be ranged"))
        ((member it-todo (list org-x-kw-todo org-x-kw-wait))
         (org-x-dag-bs-action-subiter-todo-fold child-bss
-            (->> (list :sched (plist-get sp :datetime)
-                       :dead (plist-get dp :datetime))
+            (->> (list :sched sp :dead dp)
                  (list :si-task :task-active))
           (->> "Active sub-iterator must have at least one active child"
                (either :left))
@@ -3210,7 +3214,7 @@ FUTURE-LIMIT in a list."
           (`(:iter-empty :empty-complete ,_) :complete)
           (`(:iter-empty :empty-active ,_) :empty)
           (`(:iter-nonempty :nonempty-active ,data)
-           (-let* (((&plist :dead d :leading-sched s) data)
+           (-let* (((&plist :dead d :leading-sched-dt s) data)
                    (d* (-some->> d (org-x-dag-datetime-to-epoch)))
                    (s* (-some->> s (org-x-dag-datetime-to-epoch))))
              (-if-let (epoch (if (and d* s*) (min d* s*) (or s* d*)))
diff --git a/local/lib/org-x/test/org-x-dag-test.el b/local/lib/org-x/test/org-x-dag-test.el
index a5012d4..ce7476c 100644
--- a/local/lib/org-x/test/org-x-dag-test.el
+++ b/local/lib/org-x/test/org-x-dag-test.el
@@ -225,7 +225,7 @@
                 nil nil nil :sp-proj '(:proj-active) '(:child-scheds nil)))
 
       (it "Active (scheduled)"
-        (let ((sched (org-ml-from-string 'timestamp "<2022-06-10 Fri>")))
+        (let ((sched (partition-timestamp "<2022-06-10 Fri>")))
           (expect "3788c7bc-390e-4caf-af8e-06831ff3276b" :id-to-be-action
                   nil nil nil :sp-proj '(:proj-active)
                   `(:child-scheds (,sched)))))
@@ -284,13 +284,13 @@
 
     (describe "Iterators"
       (it "Active non-empty"
-        (let ((s0 (timestamp-to-datetime "<2022-06-07 Tue>"))
-              (s1 (timestamp-to-datetime "<2022-06-14 Tue>"))
-              (s2 (timestamp-to-datetime "<2022-06-21 Tue>")))
+        (let ((s0 (partition-timestamp "<2022-06-07 Tue>"))
+              (s1 (partition-timestamp "<2022-06-14 Tue>"))
+              (s2 (partition-timestamp "<2022-06-21 Tue>")))
           (expect "2711e9b9-f765-415d-930f-b7ff16b3140b" :id-to-be-action
                   nil nil nil :sp-iter '(:iter-nonempty :nonempty-active)
-                  (list :child-sched-dts `(,s0 ,s1 ,s2)
-                        :leading-sched-dt s2
+                  (list :child-scheds `(,s0 ,s1 ,s2)
+                        :leading-sched-dt (plist-get s2 :datetime)
                         :dead nil)))))))
 
 (provide 'org-x-dag-test)