Adjusting to the latest nightly builds