Improve shortutils and rutils