Fixes for JSON instances