fixed minor namespace issues