fixes for rbx-2.0.0