[WIP] Fix build