Add failsafe mechanisms to beat the "demo devil"