Fix: race conditions in RESOURCE_ENTER/STATE/LEAVE (API Change!)