Changes to leave, benefits make it into final tax bill