More changes to fix talkin