diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el
index f5aff129e..bb03669d8 100755
--- a/contrib/lisp/org-lparse.el
+++ b/contrib/lisp/org-lparse.el
@@ -245,7 +245,8 @@ OPT-PLIST is the export options list."
 	;; The link protocol has a function for format the link
 	(setq rpl
 	      (save-match-data
-		(funcall fnc (org-link-unescape path) desc1 'html))))
+		(funcall fnc (org-link-unescape path)
+			 desc1 org-lparse-backend))))
 
        ((string= type "file")
 	;; FILE link
diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el
index 188678c5b..433001c17 100644
--- a/contrib/lisp/org-xhtml.el
+++ b/contrib/lisp/org-xhtml.el
@@ -1403,10 +1403,10 @@ lang=\"%s\" xml:lang=\"%s\">
        (END (org-lparse-begin-paragraph))))
     (t (error "Unknown environment %s" style))))
 
-(defun org-xhtml-begin-environment (style)
+(defun org-xhtml-begin-environment (style env-options-plist)
   (org-xhtml-format-environment style 'BEGIN))
 
-(defun org-xhtml-end-environment (style)
+(defun org-xhtml-end-environment (style env-options-plist)
   (org-xhtml-format-environment style 'END))
 
 (defun org-xhtml-begin-list (ltype)