Fixed problems with building