Lock polishing, few debug warnings, and minor.