Fix some more bootstrap dependencies in modulesets