+ Portability fixes: