Fixes build problems
3 files changed