Addressed more Json issues