additional common.sh changes