RIL fixes from Super Hanss