Fixmate

Fixmate improvements