Minor improvements to setup script for ubuntu.