fix loki issues

Change-Id: I7e80398b3902add0ea86e013d9b3bd7fa27e36b6