Fix a pointer bug and remove debug chaff