Fix bootstrap and some versions for bnbelgium branch refs #4837