Deploy mtime fix and deletion-replacement race condition fix