Minor build related changes

3 files changed