Minor fixes. Sanitizing comment json.