Fixed build against the latest tools