Updated controller type flags against latest Fuji