Add some output escaping