Fix debug && missing escaping