Fix namespace issues - global vs. relative