Compatability fixes for working with iSpot