Small RPL related changes.