hack: build fixes