Fixed diplomat conversion errors