Typos and icehouse changes