Some pre-release fixes