Totally overdid that last fix, shorts are fine but they need to be unsigned.