Universal build fix