Fixed up the sprite bits to actually work, I had the tracking of the state in the wrong place, which meant we'd use pre-modified bits on resume, leading to breakage. The other patches are the same. Thanks, Jesse