RIO-53: Fixes script