diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 72bf44aa7..9cf275b23 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -1491,7 +1491,10 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
                 return $str;
             }
         } else {
-            return $this->htmlentities( $formVariableValue, ENT_COMPAT, 'utf-8' );
+            $html  = '<span id="form[' . $this->name . ']">';
+            $html .= $this->htmlentities($formVariableValue, ENT_COMPAT, 'utf-8');
+            $html .= '</span>';
+            return $html;
         }
     }
 
@@ -2629,7 +2632,7 @@ class XmlForm_Field_YesNo extends XmlForm_Field
             }
         } else {
             //VIEW MODE
-            $html .= '<span id=" ' . $this->name . ' ">';
+            $html .= '<span id="' . $this->name . '">';
             $html .= ($value === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' );
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 6635b5df0..7a53721e1 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -154,7 +154,9 @@ class PMScript
         if (!defined("T_ML_COMMENT")) {
             define("T_ML_COMMENT", T_COMMENT);
         } else {
-            define("T_DOC_COMMENT", T_ML_COMMENT);
+            if (!defined("T_DOC_COMMENT")) {
+                define("T_DOC_COMMENT", T_ML_COMMENT);
+            }
         }
 
         $script = "<?php " . $sScript;
@@ -163,7 +165,7 @@ class PMScript
 
         foreach ($tokens as $token) {
             if (is_string($token)) {
-                $result = $result . $token;
+                $result .= $token;
             } else {
                 list($id, $text) = $token;
 
@@ -173,18 +175,18 @@ class PMScript
                     case T_COMMENT:
                     case T_ML_COMMENT:  //we've defined this
                     case T_DOC_COMMENT: //and this
+                        if ($text != '<?php ' && $text != '<?php' && $text != '<? ' && $text != '<?' && $text != '<% ' && $text != '<%') {
+                            $result .= $text;
+                        }
                         break;
                     default:
-                        $result = $result . $text;
+                        $result .= $text;
                         break;
                 }
             }
         }
 
-        $result = trim($result);
-        $sScript = $result;
-
-        $this->sScript = $sScript;
+        $this->sScript = trim($result);
     }
 
     /**