Fixes for FormBrowser