More squid changes