Satya -Bug Fixes

3666, 3718, 3706