UniRS: small tweaks