Small fixes

I found that the namespace fix was not working so good so I tried something else.
Also a fix with the array notation when the array is empty.