Improving patches for Icehouse