Re: portability fixes (yet another attempt)