diff --git a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
index 8a7689982d..c10511e304 100644
--- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -44,7 +44,7 @@ public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, Matrix4f
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( BlockState state, Direction side, Random rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
     {
         if( side != null )
         {
diff --git a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua
index 8a81c42e02..ffe2ddcf72 100644
--- a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua
+++ b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua
@@ -7,6 +7,9 @@
 -- they relied on Minecraft's character mappings. However, if CC emulators have
 -- taught me anything, it's that emulating LWJGL's weird key handling is nigh-on
 -- impossible.
+
+local expect = _G["~expect"]
+
 local tKeys = {}
 tKeys[32] = 'space'
 tKeys[39] = 'apostrophe'