FIX part of #1372, improvements to the recompilation checker