S2s fixes

Deployed and running on dave.cridland.net.