Fixed prod issues