Changes to address compilation on different platforms.