[GNU-692]
 4 fixes
Details: http://54.172.246.49:9090/jobs/tcwg_bootstrap_check--master-aarch64-check_bootstrap_lto-build/builds/10008/archive/artifacts/notify/mail-body.txt