Tweaks for initial release