NLM: Further cancel fixes