Reviewd fixes done by yukti