Fixes for sub-project integration