Stablization fixes

Needed changes to make Simplicity Kernel  more stable