Adjusting to latest nightly builds