Improvements in the "mystery commit"