fix namespace issues from merge with current master