Tidy-ups for fabric and JSON persistence