Fixes for USRBDX crossing

See comments from #103