Various changes for 16-bit assembly