Fix problems ushort -> short converting and xml namespaces