Bills on water shortage, affordable housing are up for final reading