[rubbos] Minor changes