More building indicator fixes