Fixed problems identified in production.