Attempt to make build work again