Merge fix, uint16_t fix