more pre-release fixes