Fix loading of interdependent packages