Pre-release bug fixes