More building status fixing