Shell Script & Make fixes