fixup! modernize build