Fixed paths/namespace issues