fix some escape issues