Fix RIL crashes, part 3