build issues fixed