Final pre-release fixes