Patches modified to icehouse