Fix functionality for multi-project builds