Some fixes to the new loader management.

Change-Id: Ib882be5762b0ebeed9b027754159f401232718e9
2 files changed