Fix the build

WIP