Fixed T&C issues