Cufflinks fixes.
Cufflinks changes.