More fixes for icehouse

Change-Id: Ia3dc1004dae2a9e0c628d9830fe8652cb43d07e5