Address multi-module builds