Sprite loader fixes & cleanup