Fix scope/namespace issues #110