Some small fixes after rolling to production.