Fixes related to exclude-from file selection