Fixed bugs in BuildingBlocks