Pre-release small bug fixes