Make the 16 bit path faster