Get t&c acceptance working again
Fix pathing issue
Wrap up 2.6 work