Some more RoD fixes