Fixing xmlns handling