Harare City addressing water challenges