pre-prototype release fixes