- fixes for new build system