bootstrap: minor portability fixes