Fix up loading model from JSON