Mali: some fixes