Some setup production fixes