Tweaks for first public release