Migrant housing bill voted, compromise plan gets Senate okay