fixed some for production