diff --git a/libsaria/trees.py b/libsaria/trees.py
index 7aa1d071..bd80123d 100644
--- a/libsaria/trees.py
+++ b/libsaria/trees.py
@@ -198,8 +198,13 @@ class PrefTree(Tree):
 
 	def init_pref(self, pref, value):
 		path = pref.split('.')
-		if self.lookup(path) == None:
+		val  = self.lookup(path)
+		if val == None:
 			self.insert(path + [value])
+			val = value
+		else:
+			val = val[0]
+		return val
 
 	def set_pref(self, pref, value):
 		path = pref.split('.')
@@ -225,9 +230,10 @@ class PersPrefTree(PrefTree):
 		self.file = file
 
 	def init_pref(self, pref, value):
-		PrefTree.init_pref(self, pref, value)
+		val = PrefTree.init_pref(self, pref, value)
 		if self.file != None:
 			files.save(self, self.file, ".tree")
+		return val
 
 	def set_pref(self, pref, value):
 		PrefTree.set_pref(self, pref, value)
diff --git a/ocarina.py b/ocarina.py
index 9cc5295c..70d71451 100755
--- a/ocarina.py
+++ b/ocarina.py
@@ -10,14 +10,10 @@ import ocarina
 
 from ocarina import collection
 
-libsaria.init_pref("ocarina.window.width", 800)
-libsaria.init_pref("ocarina.window.height", 600)
+width  = libsaria.init_pref("ocarina.window.width", 800)
+height = libsaria.init_pref("ocarina.window.height", 600)
 
-prefs = libsaria.prefs
-win_prefs = prefs.lookup_child(["ocarina", "window"])
-size = (win_prefs.get_pref("width"), win_prefs.get_pref("height"))
-
-win = ocarina.get_window(size)
+win = ocarina.get_window((width, height))
 ocarina.set_window_title("%s Your Music Everywhere" % ocarina.__vers__)
 ocarina.set_window_icon("images/ocarina.png")