Senate fixes