build issues fixing