diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..87f88c8f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+extension/*
+!extension/config.m4
+!extension/php_xhprof.h
+!extension/tests/
+!extension/xhprof.c
diff --git a/extension/xhprof.c b/extension/xhprof.c
index a053ede8..b3d849da 100644
--- a/extension/xhprof.c
+++ b/extension/xhprof.c
@@ -1702,6 +1702,9 @@ ZEND_DLEXPORT void hp_execute_internal(zend_execute_data *execute_data,
   }
 
   if (!_zend_execute_internal) {
+#if PHP_VERSION_ID >= 50500
+    if (fci == NULL) {
+#endif
     /* no old override to begin with. so invoke the builtin's implementation  */
     zend_op *opline = EX(opline);
 #if ZEND_EXTENSION_API_NO >= 220100525
@@ -1719,6 +1722,15 @@ ZEND_DLEXPORT void hp_execute_internal(zend_execute_data *execute_data,
                        EX(function_state).function->common.return_reference ?
                        &EX_T(opline->result.u.var).var.ptr:NULL,
                        EX(object), ret TSRMLS_CC);
+#endif
+#if PHP_VERSION_ID >= 50500
+    } else {
+        ((zend_internal_function *) EX(function_state).function)->handler(
+                           fci->param_count,
+                           *fci->retval_ptr_ptr,
+                           fci->retval_ptr_ptr,
+                           fci->object_ptr, ret TSRMLS_CC);
+    }
 #endif
   } else {
     /* call the old override */
diff --git a/xhprof_lib/utils/callgraph_utils.php b/xhprof_lib/utils/callgraph_utils.php
index b41eed6d..9cccc278 100644
--- a/xhprof_lib/utils/callgraph_utils.php
+++ b/xhprof_lib/utils/callgraph_utils.php
@@ -378,7 +378,7 @@ function xhprof_generate_dot_script($raw_data, $threshold, $source, $page,
 
       $result .= "N" . $sym_table[$parent]["id"] . " -> N"
                  . $sym_table[$child]["id"];
-      $result .= "[arrowsize=$arrow_size, style=\"setlinewidth($linewidth)\","
+      $result .= "[arrowsize=$arrow_size, color=grey, style=\"setlinewidth($linewidth)\","
                  ." label=\""
                  .$label."\", headlabel=\"".$headlabel
                  ."\", taillabel=\"".$taillabel."\" ]";