Fix references to other modulesets