Fix issue #286 - Renaming a file end up with two copies
Fix #287 - Timing issue regarding upstream syncs