Stability improvements for pre-0.2