fuji: Get it building on cfx