Redo md5 checking, reduce logging