Pre-release fixes