Final build fix