Pre-release fixes to user-visible scripts