Fixes for file selection