fix namespace issues