Stability Fixes

Stability fixes