fixing build issues in branch