fix building with latest tools