Improved file pick process a bit.