Another fix to build system.