more rbx fixes