portabilitytest portability fixes.