Fix workspace build issues.
2 files changed