Fixes for the merge to icehouse