Bug fixes based on JSONLoader Unit testing