Some fixes in file chooser