Building fixes

Umbar and Grey havanes extended to cities