More BuildInfo fixes for multi-module