fixes for icehouse