Minor cleanup before release