Scrutenizer cleanup (9)
fixes to make it possible to force use-space json to get around php crashes