Fix Combo and DirectoryChooser component builders