Fixed current prod issues