Sync'd with file chooser changes