Fix Linux build issues after the merge