Final post merge build fixes