Fix namespace stuff
Make some constructors explicit