Fixed uint16_t issues