these were always uint16_t's so this is the clean fix.