Minor updates to increase portability.