Fixes for coverage support and const qualifier ignored warnings.