lockfree: merge fixes from trunk