OM-61: cursor check sooner in om.core/build