RIL changes to fix building