Fixed some namespacing issues