RIL fixes from SuperHanss