[#81114876] Minor changes in some methods
[#81114936] Minor changes in some methods