Solved build issues