Fixes for new build system structure