Updated mare, Disabled some warings