Added production fixes