Minor cleanups before release