(chore): more fixes with production data