Fix some software skinning glitches

Not sure if it fixes the Pirates of the Caribbean issue (#5304), but this fixes the ones I can reproduce.

-[Unknown]