[WIP] Additional build fixes