Shell Scripts - miscellaneous tweaks for Ubuntu build script