cumulative fixes for the intra-module linkage