fix loki issues

Change-Id: I087ded421ef23df925815dc3f94c7c336f29e827