Be more tolerant for "make update"
Merge cleanups