More pre-release fixes.