Small cleanups before release