Made some corrections w.r.t PR 3377