Fixes and improvements to setup script.