Append DC identifier when we create Handles, minor fixes.