Fix a few places where / 16 should be >> 4