Updates for 16-bit.