Buildings now de-select at appropriate times