Resolved some bugs with building.