diff --git a/README.md b/README.md
index 313b0873..888ef04b 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,9 @@ There's now a [Road map](Roadmap.md) that gives a little insight into future pla
 
 ### Credits
 
-Compiler Explorer is maintained by [Matt Godbolt](http://xania.org) and [Rubén](https://github.com/RabsRincon).
-Multiple compiler and difference view initially implemented by [Gabriel Devillers](https://github.com/voxelf). 
+Compiler Explorer is maintained by [Matt Godbolt](http://xania.org) and [Rubén Rincón](https://github.com/RabsRincon).
+Multiple compiler and difference view initially implemented by [Gabriel Devillers](https://github.com/voxelf),
+while working for [Kalray](http://www.kalrayinc.com/).
 
 ### RESTful API
 
diff --git a/static/compiler.js b/static/compiler.js
index 63b3a9b3..341a603f 100644
--- a/static/compiler.js
+++ b/static/compiler.js
@@ -274,6 +274,7 @@ define(function (require) {
 
     Compiler.prototype.getBinaryForLine = function (line) {
         var obj = this.assembly[line - 1];
+        if (!obj) return '<div class="address">????</div><div class="opcodes"><span class="opcode">????</span></div>';
         var address = obj.address ? obj.address.toString(16) : "";
         var opcodes = '<div class="opcodes" title="' + (obj.opcodes || []).join(" ") + '">';
         _.each(obj.opcodes, function (op) {
diff --git a/static/explorer.css b/static/explorer.css
index a2d2641d..3a7b02b9 100644
--- a/static/explorer.css
+++ b/static/explorer.css
@@ -10,6 +10,11 @@
     margin-left: 0;
 }
 
+/* TEMP HACK: https://github.com/Microsoft/monaco-editor/issues/408 */
+.monaco-editor .monaco-editor-hover {
+    animation: none !important;
+}
+
 .navbar {
     border-radius: 0;
     margin-bottom: 2px;