Mostly portability fixes