Bug fixes for local and json reports