Changes to get RB running on DO