Icehouse

Iceshoue testing cycle fixes