Fixes for non-MSVC builds.