Fix rcl issues (ported from libucl).