Fix namespacing/template issues