buddy: fix UCS add/move/copy buddy use cases