[GNU-692]
 2 fixes
Details: https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1331/artifact/artifacts/notify/mail-body.txt/*view*/