Various FixaMinGata fixes