fixes for new build