Fixed issues with building and wonder construction