diff --git a/changes.txt b/changes.txt
index 825bd0b42..8820bb042 100644
--- a/changes.txt
+++ b/changes.txt
@@ -172,6 +172,7 @@ LOVE 0.9.0 [Baby Inspector]
   * Updated most love.filesystem functions to return nil, error on internal failure.
   * Updated love.keypressed's second argument to be a boolean indicating key repeat.
   * Updated keyboard key constants for some more modern keyboard keys.
+  * Updated window code to use adaptive vsync when available, if vsync is enabled.
   * Updated the setFilter and setWrap methods, the second argument is now optional.
   * Updated Font and ParticleSystem rendering code, now more performant.
   * Updated SpriteBatch code, now more performant when adding/setting and (un)binding.
diff --git a/src/modules/system/wrap_System.cpp b/src/modules/system/wrap_System.cpp
index 3048a94dc..c99a84f2f 100644
--- a/src/modules/system/wrap_System.cpp
+++ b/src/modules/system/wrap_System.cpp
@@ -57,24 +57,17 @@ int w_getClipboardText(lua_State *L)
 int w_getPowerInfo(lua_State *L)
 {
 	int seconds = -1, percent = -1;
-	const char *str;
+	const char *statestr;
 
 	System::PowerState state = instance->getPowerInfo(seconds, percent);
 
-	if (!System::getConstant(state, str))
-		str = "unknown";
+	if (!System::getConstant(state, statestr))
+		statestr = "unknown";
 
-	lua_pushstring(L, str);
+	lua_pushstring(L, statestr);
 
-	if (percent >= 0)
-		lua_pushinteger(L, percent);
-	else
-		lua_pushnil(L);
-
-	if (seconds >= 0)
-		lua_pushinteger(L, seconds);
-	else
-		lua_pushnil(L);
+	lua_pushinteger(L, percent);
+	lua_pushinteger(L, seconds);
 
 	return 3;
 }