Additional changes to increase portability.