16-bit-cleanness fixes from James H (again). It would be really nice