fix loki issues

atleast until the rebase is pushed

Change-Id: Iab165a02fbda06346a374447ae80280dc6ebce4f