Changed Z to uint16_t outside of OTI, fixes #7