Fix Mitch's stuff