JSON mapping corrections