Updates for newer version of icehouse