many small fix for product env

many small fix for product env