Fixup RIL class