Fixes to classify task, and in memory OMS