Fixed some namespacing issues.