Fixing some bugs created by adding the namespace