Minor shell scripting updates