16-bit int fixes.