Fix issues to run in icehouse
(cherry picked from commit e3e3388358e930dc7668ac274c8e432b0faa1a92)