Tweaks to namespaces and alike