Adjusting to the latest nighly builds