Fix for build issues
2 files changed