House, Senate budgets fund components of Leandro, but critic