Further Spider changes