Fixes #176

Add debug for some possibly un-needed companion code