Fix RIL issues