Correction to Debug/Error messages