Additional build system fix