DB/SAI: Updates for I've got a flying machine