L-01E: Improvements to Loki support

Change-Id: Id2b7918dad93dbec2f42693b4ce089c621793099