More pre-release fixes