Fix RIL crashes, part 2