SW-121. Minor refinements