fix build issues after merge