Fixed bugs around encoding / removing files in watched folder