Some updates accounting the latest changes.