zero-downtime experimental change + misc fixes