basesink: more stepping in reverse fixes