Fixed more escaping bugs