Multiple fixes, including unsupported files exception fix !