Fixed Companion build