Make compatiable to r1.8.7, precision fixes

Signed-off-by: Vivek Rai <vivekraiiitkgp@gmail.com>