More fixes
Jink copy!