Fixes for mock toolkit
Fixes for mock toolkit

pllim/ginga,pllim/ginga,ejeschke/ginga,eteq/ginga,rajul/ginga,ejeschke/ginga,stscieisenhamer/ginga,rupak0577/ginga,naojsoft/ginga,Cadair/ginga,rupak0577/ginga,stscieisenhamer/ginga,ejeschke/ginga,rajul/ginga,Cadair/ginga,rajul/ginga,rupak0577/ginga,pllim/ginga,naojsoft/ginga,eteq/ginga,sosey/ginga,Cadair/ginga,naojsoft/ginga,eteq/ginga,sosey/ginga,stscieisenhamer/ginga,sosey/ginga