Get master's fixes for the file chooser