- fixed some statements which would fail with 'set -e'