Adjusting to latest nighly builds