Synchronise more with the Unix build.
3 files changed