some escaping fixes