Further fix to build system