WIP: Build fix hack
2 files changed