Fixed namespaces. Other small fixes.