Dealing with namespace issues, etc