Minor Stability Fixes