Fix ordering issues after rewrite of package and level loading