fix prod issues