diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd
index e899e51397..d3330870aa 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd
@@ -24,9 +24,9 @@
 
 	<RuleSets>
 		<RuleSet ignorecase="false" >
-			<Delimiters>&amp;&lt;&gt;~!@%^*()-+=|\#/{}[]:;"' ,	.?</Delimiters>
+			<Delimiters>&amp;&lt;&gt;~!@$%^*()-+=|\#/{}[]:;"' ,	.?</Delimiters>
 
-			<Span name="DocLineComment" stopateol="false" bold="false" italic="false" color="Green" >
+			<Span name="DocLineComment" noescapesequences="true" stopateol="false" bold="false" italic="false" color="Green">
 				<Begin >"""</Begin>
 				<End >"""</End>
 			</Span>
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs
index da5bab5517..12a78a36d3 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs
@@ -209,6 +209,29 @@ namespace Grunwald.BooBinding.Designer
 				if (left != null && _expression != null)
 					_statements.Add(new CodeAssignStatement(left, _expression));
 				_expression = null;
+			} else if (op == BinaryOperatorType.InPlaceAddition) {
+				_expression = null;
+				node.Left.Accept(this);
+				CodeEventReferenceExpression left = _expression as CodeEventReferenceExpression;
+				_expression = null;
+				node.Right.Accept(this);
+				if (left != null && _expression != null)
+					_statements.Add(new CodeAttachEventStatement(left, _expression));
+				_expression = null;
+			} else {
+				LoggingService.Warn("CodeDomVisitor: ignoring unknown Binary Operator" + op);
+			}
+		}
+		public override void OnCastExpression(CastExpression node)
+		{
+			_expression = null;
+			node.Target.Accept(this);
+			if (_expression == null)
+				return;
+			if (_expression is CodeMethodReferenceExpression) {
+				_expression = new CodeObjectCreateExpression(ConvTypeRef(node.Type), _expression);
+			} else {
+				_expression = new CodeCastExpression(ConvTypeRef(node.Type), _expression);
 			}
 		}
 		public override void OnBlock(Block node)