Bugfixes.
Bugfixes.

Signed-off-by: deepak <f6756db1fcd61cbebf30fd7be0a1e44af00b9082@gmail.com>

dcherian/tools,dcherian/tools,dcherian/tools,dcherian/tools,dcherian/tools,dcherian/tools,dcherian/tools,dcherian/tools