Fix a few more issues.
Merge remote-tracking branch 'origin/master' into UIWorkSD