Improvements for stable release