Additional portability issues solved.