Qualified namespaces
Fix return values