Fixed Bugs generated from making Building interfaces