Some Building Bug Fixed