Some fixes for new build