Tweaks to clean up stuff prior to more general release