Fixes for UTS

--HG--
branch : UTS fixes
2 files changed