Add 0x specifiers where appropriate