Update according to latest Weston changes