diff --git a/core/pom.xml b/core/pom.xml
index ba62cddd..0d150632 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,8 +27,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
+                    <source>${maven.compiler.release}</source>
+                    <target>${maven.compiler.release}</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/jme/pom.xml b/jme/pom.xml
index c0b7eef7..353c634b 100644
--- a/jme/pom.xml
+++ b/jme/pom.xml
@@ -98,7 +98,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <release>8</release>
+                            <release>${maven.compiler.release}</release>
                             <compilerArgs>
                                 <arg>-bootclasspath</arg>
                                 <arg>${env.WTK_HOME}/lib/cldcapi11.jar${path.separator}${env.WTK_HOME}/lib/midpapi20.jar${path.separator}${env.WTK_HOME}/lib/mmapi.jar</arg>
diff --git a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
index 7c85a6e0..8ef45743 100644
--- a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
+++ b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
@@ -244,8 +244,8 @@ public class LuaScriptEngine extends AbstractScriptEngine implements ScriptEngin
 			case LuaValue.TSTRING: return luajValue.tojstring();
 			case LuaValue.TUSERDATA: return luajValue.checkuserdata(Object.class);
 			case LuaValue.TNUMBER: return luajValue.isinttype()?
-					luajValue.toint():
-					luajValue.todouble();
+					(Object) Integer.valueOf(luajValue.toint()):
+					(Object) Double.valueOf(luajValue.todouble());
 			default: return luajValue;
 		}
 	}
diff --git a/pom.xml b/pom.xml
index e242bf3b..8b692ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
+        <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
+        <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
         <luaj.brand.jse>jse ${project.version}</luaj.brand.jse>
         <luaj.brand.jme>jme ${project.version}</luaj.brand.jme>
     </properties>