more spider fixes