Changes for Icehouse