Updated against latest Fuji updates.