Tighter input checking in scripts/setup