Some small pre-release fixes