Fixes for aminator #158 and #159

this fixes namespace packages