small fixes for production