More fixes

Switched old comanche with new