Complete pre-release fixes