diff --git a/LSL2/STPROC/SCHEDULE_SERVICES.txt b/LSL2/STPROC/SCHEDULE_SERVICES.txt
index 4954aa1..a790426 100644
--- a/LSL2/STPROC/SCHEDULE_SERVICES.txt
+++ b/LSL2/STPROC/SCHEDULE_SERVICES.txt
@@ -3113,9 +3113,9 @@ end service
 Service MarkCassProcessed(WONo, CassNo, ProcessedDTM)
 	
 	If ((WONo NE '') and (CassNo NE '') and (ProcessedDTM NE '') ) then
-		If Not(Num(ProcessedDTM)) then ProcessedDTM = IConv(ProcessedDTM, 'DT')
+		If Num(ProcessedDTM) then ProcessedDTM = OConv(ProcessedDTM, 'DT2/^H')
 		// Find the SCHED_DET_NG event record that contains the cassette number
-		Query  = 'SELECT SCHED_DET_NG WITH WO_NO EQ ':WONo:' AND WITH START_DTM LE ':ProcessedDTM:' '
+		Query  = 'SELECT SCHED_DET_NG WITH WO_NO EQ ':WONo:' AND WITH START_DTM LE "':ProcessedDTM:'" '
 		Query := 'AND WITH UNPROCESSED_CASS EQ ':CassNo:' BY START_DTM'
 		GoSub ClearCursors
 		RList(Query, TARGET_ACTIVELIST$, '', '', '')
diff --git a/LSL2/STPROC/WO_MAT_ACTIONS.txt b/LSL2/STPROC/WO_MAT_ACTIONS.txt
index 8ac890f..40e6fd7 100644
--- a/LSL2/STPROC/WO_MAT_ACTIONS.txt
+++ b/LSL2/STPROC/WO_MAT_ACTIONS.txt
@@ -792,20 +792,7 @@ WRITE_RECORD:
     end
     
     PSNo     = {WO_STEP_PS_NO}
-    SpecType = Xlate('PROD_SPEC', PSNo, 'SPEC_TYPE', 'X')
-    If ( (SpecType EQ 'P') and (Record<WO_MAT_WAFER_QTY$> LT 25) ) then
-        // Notify FI as this is unusual and can cause systematic issues.
-        Recipients   =  XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X')
-        SentFrom     = 'OI Admin'
-        Subject      = 'WO_MAT cassette quantity less than 25 detected!'
-        Message      = 'WO_MAT ':@ID:' quantity is ':Record<WO_MAT_WAFER_QTY$>:'. Correct if needed!'
-        AttachWindow = 'WO_MAT'
-        AttachKey    = @ID   
-        SendToGroup  = ''   
-        Parms        = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
-        obj_Notes('Create',Parms) 
-    end
-    
+
 	If {REACTOR_TYPE} EQ 'EPP' then
 		NewEppMUFlag   = Record<WO_MAT_EPO_MAKEUP_BOX$>
 		OrigEppMUFlag  = OrigRecord<WO_MAT_EPO_MAKEUP_BOX$>
@@ -826,7 +813,7 @@ WRITE_RECORD:
         Work_Order_Services('UpdateReceivedQty', WONo)
         Work_Order_Services('UpdateReleasedQty', WONo)
     end
-    
+
     CurrWaferCount  = obj_WO_Mat('CurrWaferCnt', WOMatKeyID)
     If CurrWaferCount EQ 0 then
     	// This should catch cases where the entire cassette is "peeled off", NCR'ed, or used for destructive testing.