Various minor cross-platform changes

Review URL: https://codereview.chromium.org/1310843007
2 files changed