--- a/FileBrowserV2.st	Fri Feb 13 11:48:09 2015 +0100
+++ b/FileBrowserV2.st	Fri Feb 13 11:54:10 2015 +0100
@@ -1765,7 +1765,7 @@
     "return/create the 'bookmarkBarVisibleHolder' value holder (automatically generated)"
 
     bookmarkBarVisibleHolder isNil ifTrue:[
-        bookmarkBarVisibleHolder := true asValue.
+        bookmarkBarVisibleHolder := ValueHolder with:true.
         bookmarkBarVisibleHolder addDependent:self.
     ].
     ^ bookmarkBarVisibleHolder
@@ -1810,8 +1810,8 @@
 
 busyLabelHolder
     ^ self
-	aspectFor:#busyLabelHolder
-	ifAbsent:[ ' ' asValue ].
+        aspectFor:#busyLabelHolder
+        ifAbsent:[ ValueHolder with:' ' ].
 
     "Created: / 25-07-2006 / 09:06:00 / cg"
 !
@@ -1946,8 +1946,8 @@
 selectedDeviceDrive
 
     selectedDeviceDrive isNil ifTrue:[
-	selectedDeviceDrive := self listOfDeviceDrives first asValue.
-	selectedDeviceDrive addDependent:self.
+        selectedDeviceDrive := ValueHolder with:(self listOfDeviceDrives firstIfEmpty:nil).
+        selectedDeviceDrive addDependent:self.
     ].
     ^ selectedDeviceDrive
 ! !
@@ -1955,7 +1955,7 @@
 !FileBrowserV2 methodsFor:'aspects-visibility'!
 
 busyLabelVisibleHolder
-    ^ self aspectFor:#busyLabelVisibleHolder ifAbsent:[false asValue]
+    ^ self aspectFor:#busyLabelVisibleHolder ifAbsent:[ValueHolder with:false]
 
     "Created: / 25-07-2006 / 09:06:22 / cg"
 !
@@ -1967,25 +1967,25 @@
 filenameEntryFieldVisibleHolder
     " aspect for show FileEntryField "
 
-    ^ self aspectFor:#filenameEntryFieldVisibleHolder ifAbsent:[true asValue]
+    ^ self aspectFor:#filenameEntryFieldVisibleHolder ifAbsent:[ValueHolder with:true]
 !
 
 infoBarVisibleHolder
     " aspect for show infoBar "
 
-    ^ self aspectFor:#infoBarVisibleHolder ifAbsent:[true asValue]
+    ^ self aspectFor:#infoBarVisibleHolder ifAbsent:[ValueHolder with:true]
 !
 
 previewVisibleHolder
     " aspect for show preview"
 
-    ^ self aspectFor:#previewVisibleHolder ifAbsent:[false asValue]
+    ^ self aspectFor:#previewVisibleHolder ifAbsent:[ValueHolder with:false]
 !
 
 toolBarVisibleHolder
     " aspect for show toolbar"
 
-    ^ self aspectFor:#toolBarVisibleHolder ifAbsent:[true asValue]
+    ^ self aspectFor:#toolBarVisibleHolder ifAbsent:[ValueHolder with:true]
 ! !
 
 !FileBrowserV2 methodsFor:'change & update'!
@@ -2589,11 +2589,11 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.230 2015-02-04 18:10:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.231 2015-02-13 10:54:10 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.230 2015-02-04 18:10:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.231 2015-02-13 10:54:10 cg Exp $'
 ! !