Minor shell script tweaks