Some more bug fixes for the setup script.

Refs #6107