Further build fix