Fix for file extensions; Fix for vendor files watcher.