[rubbos] (bug-fix:minor) Various bug-fixes.