More sprite image fixes

Continuing the sprite image refactoring project