More fixes on SnowShoeStamp