Fixed the project build issues