Minor tweaks for stable release