Issue 8798 by sgl: Addtional corrections