Build system fix