touch-ups for migration / production deployment