Small Stability Fixes