[100] module dependency fixes