fixed issues for production