a few more changes for production