Backport rbx fixes from master