Fixed .bad mismatches due to strengthened const checking