BrowseObjects

Fix 2 issues before implementing BrowseObjects