Fixes to bulk-matric output