Add portability fixes