Fix some more issues found on Mac builds.
7 files changed