Pre-release fixes (minor).