Bugfixes with namespace change