Portability fixes Jul 19