Post-merge changes to fix the new build system on Linux