Fix RIL crashes, part 4