Clarify specs
Fix JSON builds