Correct handling of i686 archs, bug fixes for set -e